summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-04-20 20:32:43 +0200
committerbunnei <bunneidev@gmail.com>2023-06-03 09:05:53 +0200
commit89593d70bfa725e55b46dd0f66dd1ceb7eebfaae (patch)
treedbb02c9f80371d91118f41653566e207ad5d2ef2
parentandroid: Adjustments to home option card (diff)
downloadyuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.tar
yuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.tar.gz
yuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.tar.bz2
yuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.tar.lz
yuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.tar.xz
yuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.tar.zst
yuzu-89593d70bfa725e55b46dd0f66dd1ceb7eebfaae.zip
-rw-r--r--src/android/app/src/main/res/values-v29/themes.xml11
-rw-r--r--src/android/app/src/main/res/values/themes.xml8
2 files changed, 4 insertions, 15 deletions
diff --git a/src/android/app/src/main/res/values-v29/themes.xml b/src/android/app/src/main/res/values-v29/themes.xml
deleted file mode 100644
index ba436f7a4..000000000
--- a/src/android/app/src/main/res/values-v29/themes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="Theme.V29.Yuzu" parent="Theme.Yuzu">
- <item name="android:enforceStatusBarContrast">false</item>
- <item name="android:enforceNavigationBarContrast">false</item>
- </style>
-
- <style name="Theme.Yuzu.Main" parent="Theme.V29.Yuzu" />
-
-</resources>
diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml
index dfad059b6..127eaf70e 100644
--- a/src/android/app/src/main/res/values/themes.xml
+++ b/src/android/app/src/main/res/values/themes.xml
@@ -7,7 +7,7 @@
<item name="postSplashScreenTheme">@style/Theme.Yuzu.Main</item>
</style>
- <style name="Theme.Yuzu" parent="Theme.Material3.DayNight.NoActionBar">
+ <style name="Theme.Yuzu.Main" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/yuzu_primary</item>
<item name="colorOnPrimary">@color/yuzu_onPrimary</item>
<item name="colorPrimaryContainer">@color/yuzu_primaryContainer</item>
@@ -42,9 +42,9 @@
<item name="sliderStyle">@style/YuzuSlider</item>
<item name="android:windowLayoutInDisplayCutoutMode">default</item>
- </style>
- <!-- Trick for API >= 29 specific changes -->
- <style name="Theme.Yuzu.Main" parent="Theme.Yuzu" />
+ <item name="android:enforceStatusBarContrast">false</item>
+ <item name="android:enforceNavigationBarContrast">false</item>
+ </style>
</resources>